From: Steven Tamm Date: Thu, 11 Mar 2004 05:56:41 +0000 (+0000) Subject: * image.c [MAC_OSX]: Include sys/stat.h X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~23727 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=b926b6e80c5684d0439409c87137a62657bad2ac;p=emacs.git * image.c [MAC_OSX]: Include sys/stat.h * macfns.c (syms_of_macfns): Remove definitions of things now defined in image.c --- diff --git a/src/ChangeLog b/src/ChangeLog index cb8536fc65d..59817d12cb4 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2004-03-11 Steven Tamm + * image.c [MAC_OSX]: Include sys/stat.h + + * macfns.c (syms_of_macfns): Remove definitions of things now + defined in image.c + 2004-03-11 Kim F. Storm The following changes consolidates the identical/similar image diff --git a/src/image.c b/src/image.c index 9704f6d14f0..1067227859c 100644 --- a/src/image.c +++ b/src/image.c @@ -92,6 +92,7 @@ typedef HDC XImagePtr_or_DC; #include #endif #ifdef MAC_OSX +#include #include #else /* not MAC_OSX */ #include diff --git a/src/macfns.c b/src/macfns.c index a9dcdc5e85a..18697c59a49 100644 --- a/src/macfns.c +++ b/src/macfns.c @@ -4391,22 +4391,6 @@ Chinese, Japanese, and Korean. */); set_frame_fontset_func = x_set_font; check_window_system_func = check_mac; - Qjpeg = intern ("jpeg"); - staticpro (&Qjpeg); - - Qtiff = intern ("tiff"); - staticpro (&Qtiff); - - Qgif = intern ("gif"); - staticpro (&Qgif); - - Qpng = intern ("png"); - staticpro (&Qpng); - - defsubr (&Sclear_image_cache); - defsubr (&Simage_size); - defsubr (&Simage_mask_p); - hourglass_atimer = NULL; hourglass_shown_p = 0;